[pull] master from ant-design:master #4

pull · 2021-07-22T13:45:33Z

See Commits and Changes for more details.

Created by pull[bot] (v2.0.0-alpha.3)

Can you help keep this open source service alive? 💖 Please sponsor : )

Co-authored-by: afc163 <[email protected]>

Co-authored-by: liuqiang <[email protected]>

…t. (#56075) * docs:add an FAQ entry explaining the deprecation of the List component. Signed-off-by: Iristack <[email protected]> * docs:add an english FAQ entry explaining the deprecation of the List component. Signed-off-by: Iristack <[email protected]> * docs:add faq anchor point Signed-off-by: Iristack <[email protected]> * docs:add enflish faq anchor point Signed-off-by: Iristack <[email protected]> * docs:format Signed-off-by: Iristack <[email protected]> * docs:format Signed-off-by: Iristack <[email protected]> * docs: format english Signed-off-by: Iristack <[email protected]> * docs: del faq embed Signed-off-by: Iristack <[email protected]> * docs: format english Signed-off-by: Iristack <[email protected]> --------- Signed-off-by: Iristack <[email protected]> Co-authored-by: 遇见同学 <[email protected]>

* docs: update cssVar type and TabItemType api description * feat: update --------- Co-authored-by: thinkasany <[email protected]>

Co-authored-by: afc163 <[email protected]>

* docs: update react-router docs * update

chore: sync master into feature

) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore: update virtual-scroll demo * update

chore: merge master into feature

chore: merge feature into master

* docs: add changelog 6.1.0 * Update CHANGELOG.zh-CN.md Co-authored-by: Amumu <[email protected]> Signed-off-by: xrkffgg <[email protected]> * Update CHANGELOG.en-US.md Co-authored-by: Amumu <[email protected]> Signed-off-by: xrkffgg <[email protected]> * Update CHANGELOG.en-US.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Signed-off-by: xrkffgg <[email protected]> * Update CHANGELOG.en-US.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Signed-off-by: xrkffgg <[email protected]> * Update CHANGELOG.en-US.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Signed-off-by: xrkffgg <[email protected]> * Update CHANGELOG.en-US.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Signed-off-by: xrkffgg <[email protected]> * Update CHANGELOG.en-US.md Co-authored-by: Amumu <[email protected]> Signed-off-by: xrkffgg <[email protected]> --------- Signed-off-by: xrkffgg <[email protected]> Co-authored-by: Amumu <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

Co-authored-by: afc163 <[email protected]>

Co-authored-by: liuqiang <[email protected]>

…ider (#55985) * fix(drawer): support closable placement configuration from ConfigProvider * Update components/drawer/__tests__/Drawer.test.tsx Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> Signed-off-by: 遇见同学 <[email protected]> * Update components/drawer/DrawerPanel.tsx Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> Signed-off-by: 遇见同学 <[email protected]> * fix: add config-provider for drawer props on closable * update --------- Signed-off-by: 遇见同学 <[email protected]> Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> Co-authored-by: thinkasany <[email protected]> Co-authored-by: Amumu <[email protected]>

@meet-student

* doc: Table faq virtual with ref * doc: update * Apply suggestion from @meet-student Signed-off-by: 遇见同学 <[email protected]> * Apply suggestion from @meet-student Signed-off-by: 遇见同学 <[email protected]> * Apply suggestion from @meet-student Signed-off-by: 遇见同学 <[email protected]> * doc: en version * fix: tsx * Update components/table/index.zh-CN.md Co-authored-by: lijianan <[email protected]> Signed-off-by: guoming <[email protected]> * doc: forward type --------- Signed-off-by: 遇见同学 <[email protected]> Signed-off-by: guoming <[email protected]> Co-authored-by: 遇见同学 <[email protected]> Co-authored-by: lijianan <[email protected]>

Co-authored-by: afc163 <[email protected]>

Co-authored-by: afc163 <[email protected]> Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: thinkasany <[email protected]>

…r switching themes (#56544) * fix: add keepAlive animation to theme transition * style: modify animation keyframes --------- Co-authored-by: thinkasany <[email protected]> Co-authored-by: 遇见同学 <[email protected]>

chore: Merge feature into master

* feat(Tour): add keyboard prop to control keyboard shortcuts * Update components/tour/index.en-US.md Signed-off-by: thinkasany <[email protected]> * Update components/tour/index.zh-CN.md Signed-off-by: thinkasany <[email protected]> --------- Signed-off-by: thinkasany <[email protected]> Co-authored-by: 路振凯 <l> Co-authored-by: thinkasany <[email protected]>

* feat: add marginSize prop for QRCode quiet zone * Apply suggestions from code review Signed-off-by: afc163 <[email protected]> * Update components/qr-code/index.en-US.md Co-authored-by: thinkasany <[email protected]> Signed-off-by: afc163 <[email protected]> * Apply suggestions from code review Co-authored-by: thinkasany <[email protected]> Signed-off-by: afc163 <[email protected]> --------- Signed-off-by: afc163 <[email protected]> Co-authored-by: thinkasany <[email protected]>

chore: merge feature into master

Co-authored-by: afc163 <[email protected]>

* docs: init * docs: en ver

…wo Chinese characters. (#56593)

* fix: improvement style order * update snap * update undefined * snap update

…dencies group (#56599) * chore: bump @antfu/eslint-config in the dev-dependencies group Bumps the dev-dependencies group with 1 update: [@antfu/eslint-config](https://github.com/antfu/eslint-config). Updates `@antfu/eslint-config` from 6.7.3 to 7.0.0 - [Release notes](https://github.com/antfu/eslint-config/releases) - [Commits](antfu/eslint-config@v6.7.3...v7.0.0) --- updated-dependencies: - dependency-name: "@antfu/eslint-config" dependency-version: 7.0.0 dependency-type: direct:development update-type: version-update:semver-major dependency-group: dev-dependencies ... Signed-off-by: dependabot[bot] <[email protected]> * update * test lock --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: thinkasany <[email protected]>

#56605) * perf: use createStaticStyles * chore: update snap * chore: adjust * chore: snap

Bumps [@eslint-react/eslint-plugin](https://github.com/Rel1cx/eslint-react/tree/HEAD/packages/plugins/eslint-plugin) from 2.5.0 to 2.6.2. - [Release notes](https://github.com/Rel1cx/eslint-react/releases) - [Changelog](https://github.com/Rel1cx/eslint-react/blob/main/CHANGELOG.md) - [Commits](https://github.com/Rel1cx/eslint-react/commits/v2.6.2/packages/plugins/eslint-plugin) --- updated-dependencies: - dependency-name: "@eslint-react/eslint-plugin" dependency-version: 2.6.2 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…ltiple components (#56610) * refactor: replace createStyles with createStaticStyles across multiple components * chore: update --------- Co-authored-by: thinkasany <[email protected]>

* fix: replace disable with mergedDisabled * update * update --------- Co-authored-by: 遇见同学 <[email protected]>

…56598) * fix(css): replace background transition with background-color * chore: update --------- Co-authored-by: thinkasany <[email protected]>

* test: fix test case * chore: fix lint

Co-authored-by: 遇见同学 <[email protected]>

Co-authored-by: afc163 <[email protected]>

Bumps [@eslint-react/eslint-plugin](https://github.com/Rel1cx/eslint-react/tree/HEAD/packages/plugins/eslint-plugin) from 2.6.2 to 2.6.4. - [Release notes](https://github.com/Rel1cx/eslint-react/releases) - [Changelog](https://github.com/Rel1cx/eslint-react/blob/main/CHANGELOG.md) - [Commits](https://github.com/Rel1cx/eslint-react/commits/v2.6.4/packages/plugins/eslint-plugin) --- updated-dependencies: - dependency-name: "@eslint-react/eslint-plugin" dependency-version: 2.6.4 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix(Site): improve changelog header styles and locale detection * style: fix link and button style conflicts in typography * style: modify style file * style: reset typography mixins.ts file --------- Co-authored-by: 遇见同学 <[email protected]>

* fix: import a single DownOutlined icon from antd-icons Signed-off-by: 沈鸿飞 <[email protected]> * Update components/breadcrumb/Breadcrumb.tsx Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> Signed-off-by: 沈鸿飞 <[email protected]> --------- Signed-off-by: 沈鸿飞 <[email protected]> Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

* fix(table): border radius not work * fix(table): apply border radius to shadow pseudo elements

…r prevent suffix icon rendering when user set `suffixIcon` to null or false (#56637) Co-authored-by: thinkasany <[email protected]>

pull bot added ⤵️ pull merge-conflict Resolve conflicts manually labels Jul 22, 2021

MadCcc force-pushed the master branch from c0b9b07 to 483c8d3 Compare June 27, 2022 09:45

MadCcc force-pushed the master branch from 5df1131 to 18f9be6 Compare March 31, 2024 05:25

zombieJ force-pushed the master branch from ac62fd9 to 160c253 Compare February 9, 2025 09:03

MadCcc force-pushed the master branch from 922905c to ca4882e Compare August 11, 2025 08:59

github-actions bot and others added 24 commits December 5, 2025 02:19

chore: upgrade deps (#56079)

7ed842f

Co-authored-by: afc163 <[email protected]>

refactor: bump @ant-design/react-slick to drop classnames (#56080)

88c49f7

feat(Select): The optionFilterProp supports string and string[] (#56057)

523a911

Co-authored-by: liuqiang <[email protected]>

docs: update cssVar type and TabItemType api description (#56068)

cf3b82c

* docs: update cssVar type and TabItemType api description * feat: update --------- Co-authored-by: thinkasany <[email protected]>

fix(Table): cellFontSizeSM not working (#55770)

2576b44

chore: upgrade deps (#56092)

1e120af

Co-authored-by: afc163 <[email protected]>

docs: update react-router docs (#56096)

2231701

* docs: update react-router docs * update

chore: sync master into feature

805bf9d

chore: auto merge branches (#56099)

025b9da

chore: sync master into feature

chore(deps): update softprops/action-gh-release action to v2.5.0 (#56103

74b22fd

) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

chore: update virtual-scroll demo (#56108)

3b54543

* chore: update virtual-scroll demo * update

type: ConfigProvider support Table rowKey (#56095)

25660f1

chore: auto merge branches (#56114)

e068981

chore: merge master into feature

chore: auto merge branches (#56113)

6e0a6f0

chore: merge feature into master

chore: upgrade deps (#56124)

cf80ca8

Co-authored-by: afc163 <[email protected]>

fix(Select): selectorBg token does not work in v6 (#56052)

68928fb

Co-authored-by: liuqiang <[email protected]>

fix: Form onValuesChange logic (#56129)

56c7c9f

fix(Breadcrumb): lift link style priority (#56137)

2c67f5d

chore: upgrade deps (#56143)

8ba9589

Co-authored-by: afc163 <[email protected]>

docs: fix colors block text (#56132)

8357f74

Co-authored-by: afc163 <[email protected]> Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: thinkasany <[email protected]>

QdabuliuQ and others added 30 commits January 12, 2026 15:22

chore: auto merge branches (#56580)

4f53033

chore: Merge feature into master

chore: auto merge branches (#56583)

fbd6fda

chore: merge feature into master

chore: upgrade deps (#56584)

b3adc9a

Co-authored-by: afc163 <[email protected]>

update (#56589)

185398a

docs: Changelog of 6.2.0 (#56588)

d90f8ed

* docs: init * docs: en ver

chore: update post pub script

050d1df

docs(table): add content semantic (#56592)

e05aa23

fix(Button): child element's className being cleared when rendering t…

8fd30ab

…wo Chinese characters. (#56593)

fix: improve Button child style order (#56597)

40c0bd6

* fix: improvement style order * update snap * update undefined * snap update

docs: improve performance replace createStyles with createStaticStyles (

3c9bb68

#56605) * perf: use createStaticStyles * chore: update snap * chore: adjust * chore: snap

chore: improve closablePlacement (#56611)

258573a

docs: refactor replace createStyles with createStaticStyles across mu…

07f0db2

…ltiple components (#56610) * refactor: replace createStyles with createStaticStyles across multiple components * chore: update --------- Co-authored-by: thinkasany <[email protected]>

fix: replace disabled with mergedDisabled (#56613)

28d6744

* fix: replace disable with mergedDisabled * update * update --------- Co-authored-by: 遇见同学 <[email protected]>

refactor(css): replace background transition with background-color (#…

f7446f3

…56598) * fix(css): replace background transition with background-color * chore: update --------- Co-authored-by: thinkasany <[email protected]>

test: fix test case (#56620)

a680d84

* test: fix test case * chore: fix lint

chore: improve collapse cloneElement (#56622)

fccc092

Co-authored-by: 遇见同学 <[email protected]>

chore: upgrade deps (#56625)

4f61124

Co-authored-by: afc163 <[email protected]>

fix: should skip appendStyle when value is null or undefined (#56636)

247c41c

refactor(Grid): use genCssVar hook to generate CSS variables (#56635)

5df2c59

fix(table): border radius not work (#56478)

77f0f1a

* fix(table): border radius not work * fix(table): apply border radius to shadow pseudo elements

refactor: replace SuffixIcon with useSuffixIcon in date-picker fo…

fecb9a0

…r prevent suffix icon rendering when user set `suffixIcon` to null or false (#56637) Co-authored-by: thinkasany <[email protected]>

fix: import individual icons from antd-icons (#56640)

3eecc36

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[pull] master from ant-design:master #4

[pull] master from ant-design:master #4

Uh oh!

pull bot commented Jul 22, 2021 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

[pull] master from ant-design:master #4

Are you sure you want to change the base?

[pull] master from ant-design:master #4

Uh oh!

Conversation

pull bot commented Jul 22, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

pull bot commented Jul 22, 2021 •

edited

Loading